bitkeeper revision 1.1314 (42642022uxXkB91UbVd9yk-liaeCHA)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

diff --cc BitKeeper/etc/logging_ok
index adabcee7f0ce103061b1d6832adb2828ffec0d31,f5ca0d0fc923fd7c2227f98df32bbc83e0a049a7..f1c97b30282a8c3912c766b22ea9e7c17cc5318b
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -28,8 -20,7 +28,9 @@@ djm@sportsman.spdomai
  doogie@brainfood.com
  gm281@boulderdash.cl.cam.ac.uk
  gm281@tetrapod.cl.cam.ac.uk
 +harry@dory.(none)
+ hollisb@us.ibm.com
 +iap10@firebug.cl.cam.ac.uk
  iap10@freefall.cl.cam.ac.uk
  iap10@labyrinth.cl.cam.ac.uk
  iap10@nidd.cl.cam.ac.uk